Auto merge of #2579 - alexcrichton:robust-submodule, r=brson

Remove submodule directory before cloning

If the directory is in a corrupt state that caused an existing repository to not
successfully open, then we'll want to blow it away anything that already exists
to ensure we start from a clean slate.

Closes #2567

diff --cc src/cargo/sources/git/utils.rs
Simple merge